From: Linus Torvalds Date: Thu, 20 Apr 2006 14:58:58 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~44416 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bf7cf6ee1bd00679bbe93b6ae73f80032759b8df;p=linux-4.9.git Merge /pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: __NR_sys_splice --> __NR_splice --- bf7cf6ee1bd00679bbe93b6ae73f80032759b8df